Merge pull request #48 from heil/master
authorsbyx <[email protected]>
Mon, 23 Jun 2014 16:52:09 +0000 (18:52 +0200)
committersbyx <[email protected]>
Mon, 23 Jun 2014 16:52:09 +0000 (18:52 +0200)
nginx: import from packages, add myself as the maintainer


Trivial merge